Fix tests, improve travis instructions.