Merge "First pass over Toolbar CTS tests" into nyc-dev