finished writing Floor tests
passed all of the tests after merge with Michaels code