renaming test method and cleaning