SYNC 2.x branch
Sync
Tests: 141 passed
Duration: 5 minutes
Changes: Who: Cosmin Ioan <cioan@pih.org>
Why: MLW-1448, update unit test case
Changes by Cosmin Ioan <cioan@pih.org>