Update capture usage, fix failing tests for recent changes