Rewrite session tests that are failing on travis 2.1.1