altered db tests for collation, reverted travis yml