integrated feedback from Tom, added integration tests