Fix broken test cruft