Minor fixes to test case