squishy: fix a couple tests, rename a thing because reasons

Change-Id: I3316a6f29840645fbb5f5d2c98547aee775aa462
stupid lockfile

Change-Id: I7b4ad3f9fbd5cbd9f283d9b81248ad90431b2007
stupider lockfile

Change-Id: Ia159bf1c866a7742b513875cb57f89129d622531
sq: got one test actually passing and everyghing

Change-Id: Ie0cded09cc63f7e79da4da83698d78848d6b9936