make tests pass again