Added additional test failure-checking