Cleaned up tests a bit more