Revert test code.[ci skip]
For Travis CI - Scale back to use just 1 process when retrying.
For Travis CI - switch CI build to use OS X build environment.