Continue to shore up tests in preparation for working on #268