Controller tests

@aespaldi @strand please review this Testing Branching Pull Request.

Thank you,

Team Jury