Merge "Run Chooser integration tests for the new features"