Test coverage and refactor

Just did a bit of refactoring (fat models, skinny controller style) and fixed the capybara tests plus added more coverage for funs...