Fix tests for code changes
Fix code for no errors from validate record