Further test-case updates
Removed old testcases