working on integration tests
fixed merge conflict
began adding integration tests'