Make tests pass *grumble grumble*