Removed a temporary test class and fixed a test