Fix up tests from last commit