Fix failing specs.
More work to get Travis working.