Change package declaration of test classes to match the file structure. Also remove an unused import