AGP-420: fix tests