Unbreak tests

Last two commits introduced some test breakage. Fear not. I have fixed
them.