Last of my fixes for the tests