Extend tests for Remove actions

Couple of bugs are fixed as well