SQUASH ME: Utest improvements
SQUASH ME: Couple of minor changes