Changed some imports to relative imports in tests