MDLSITE-3650 added unit tests and reshuffled to make unit testing possible
Merge pull request #3 from andyjdavis/MDLSITE-3650_unit_tests

MDLSITE-3650 added unit tests and reshuffled to make unit testing possib...