Merge pull request #38 from ByteBlast/master

Refactored ControllerResultTest class.
Beginnings of #25.