Check for calling remove when service is in `invalid-key` on tests and examples

[EddyTheCo]

There is no longer a need to call remove when the service error was invalid-key. Check if we do this on the examples and tests to reduce logic.

Originally posted by @EddyTheCo in #44 (review)