Fixes to test case