Added unit tests for Workarounds:ControllerHelpers
Fixed a few bugs surfaced by tests.