Adding integration tests for PR #8