Fixing up the tests a bit more
Fixing up the tests a bit more