Upgrading for trusty and awesome 3.5.x
Getting the test around the right way.