Fixed a few broken tests

Broken then when shortening folder names