Add a few more checks to the tests