EZP-21771: Add unit test
EZP-21771: Add integration test
Merge pull request #600 from MLoureiro/ezp21771_integration_test

EZP-21771: Add integration test