Merge "More test annotations." into nyc-dev