rename some oddball unit test classes