Fixed the tests, hoped Hannah would be ok with my doing this