Improve Unit Testing

[brito-rafa]

There is only a test for the controller, and it is pretty much no-op.