Test the tests, fix a bug that was found in testing