Started adding integration tests