Refactored spec/controllers/* Closes #17