fix test case shrinking and fix quoting bug
clean up and speed up tests