EPG-34485: refactor test cases