Cleaned up tests, should work now