Shoring up our tests