Fix broken rm tests; fix rm -ar logic and clarify error message