WIP

Removed odd imports from DBTester2