ERT-541: Refactored test