CB-6959 Removed capture tests

Removed potential merge conflicts