BS-10440, added integration tests