[SQUASH ME] add more tests