Fixes #5821 - add tests for capsule related features