s fix gets rid of multilevels of test saveme folders #3594