Added the MTEST_FAIL_COUNT stuff back in.