Fix controller plugin
Fixed up some tests
Remove some broken tests
Refactor set if not null calls
Merge pull request #2 from tomphp/first-pr

Fix controller plugin