More refactoring
Configure travis for DB testing