Adding deregisterWishesWithContext. Adding new tests for this. Removing some old tests.