test case fixes and additions