new test cases, some cleanup