Revert the no clone on Travis patch and adjust the working/clone paths