Merge "Make empty declaration tests positive." into mnc-dev