Controller tests

@aespaldi @strand please review this Testing Branching Pull Request. Not using factory girl for the most part due to inability to get associations to work.

Thank you,

Team Jury