Also includes minor test tweaks.
Now the SDK matches everything else that we have published to bintray and jcenter.