Created integration tests (not complete)
Created integration tests (not complete)
Merge remote-tracking branch 'origin/master'