EST-410: working on integration tests.
Merge branch 'master' of https://github.com/estatio/estatio