fixed rm files test, removed multiple-head test, fixed base rm test