Change location of tests conform best practice.
Change imports to new location