Cleans up rebase issue, adds 2 basic Controller Specs.