Small refactor to tests.
Added removal of items.