Remove controller key correctly
Add tests
Merge pull request #48 from ivantsepp/removal_of_controller_key_fix

Remove controller key correctly