In progress with test case updates