[test] Refactor some integration tests
Merge pull request #206 from lpinca/refactor/integration-tests

Refactor some integration tests