Some cleanup
various cleanups of test cases