Added rm tests, refactored start state to better test rm