Merge "Remove tests for dead API." into honeycomb