acu114903 [rs-base] Add remove_swap recipe and update tests