SOAP-1397: Fixing given, when and then in gui tests