Updated unit tests for #2028, #2029