fixes to new folder names for testing