fixes to get the tests working on Travis
merged master into pharogemstone