Merge pull request #1024 from rustyswayne/Refactor/M-502

Adds basic controller tests and asserts Merchello can be added as a module to Umbraco ngApp.