Cleanup attempt to test, and missed merge.