cleanup on Unit Test code
renaming files to the correct UnitTest syntax