Improve test cases, smaller improvements