OF-850: Improve default initialization state

Minor changes to system utility classes to improve initial state of the
system, particularly during unit testing.
Merge pull request #113 from tevans/OF-850

OF-850: Improve default initialization state