MAESTRO-2709 tests updated