Add a couple more checks in the test