correct the tests
organize imports