Merge "Update tests" into mnc-dev