Cleaned up more in Test 1