Merged a ton of changes from branch paulbi. Almost all tests still work now. Only a few left to change.
Missed a bit of a change, sorry
Forgot to add in TestFloor and TestFloorLocation
Added flipCard() behavior