Holly made more test case changes...