ezp-21826 tests updtes and error management