Fixed minor issues with folder change

- Tests passing in MATLAB + Windows