Embedded cluster/integration tests update.
Merge pull request #309 from tbak/2.x

2.x Embedded cluster/integration tests update.