Fix a couple of tests that were simply wrong and only worked on really fast machines.