fix missing import
fix missing dir for cork
travis issues fixed
refactor of tests