Port bug fix (directory with space) from 3.0
Removed the cypress test.