Some cleanup/fixes to make Travis run tests