test fixes from ev