make tests pass after merge