You won't believe what happened to the tests

They were moved into their own package. Also, remove some unused imports