Removed unnecessary imports.
Removed unnecessary method and renamed a test to be able to remove the `@test` annotation.