Cleaned up the test