Fix existing tests, failing because of folder name change