testing standard controller method in progress
rspec conversion in progress
completed conversion to generated controller methods
Merge branch 'develop' into rspec
finished conversion of controllers to rspec and massively refactored duplicated test code
changed unit tests to rspec