Adds tests and controller methods
Merge remote-tracking branch 'origin/master'