ezp-22049 completing tests