Made the tests a bit more solid