Fix imports in AdvTester so it will compile under more common build environments