Make the tests a little more flexible