fixed tests borked by an earlier refactoring.