A lot of changes updating the tests to the new remove behaviour.