Going back through in first unit testing phase which also involves some refactoring due to things exposed by testing.
More coverage and cleanup for the single action controller.