Fixed up case further and all tests are green