modified files to get tests working in travis ci