Fix last two test failures in the subset actually being run.