LUN-1608: fix tests