renamed unit test classes and functions
fixed error messages in unit tests