Reorganize methods
Refactor remove action, add conditional for failure case
Add #remove_listing instance method
Rename test assertions
Add test for #remove_listing