Fix observer removal logic
Add removal of observer in test
Merge pull request #111 from ndonald2/develop

Fix observer removal logic