Review fixes
Update tests to capture_output