Squash - add test cases, clean up test