oops!
Fixing potential crash caused by failed validation with nil
Renaming methods in UnitTest