Tweak tests so they test the right things, and change other stuff to make them pass