8/4 MORA - Refactored Default Controller and flushed out test suite