import cleanup, move tests to appropriate package