renamed some unittests for better organization