Merge pull request #98 from mnjuhn/master

Correcting variable names/comments in demand tests.
Moving PIF MO into measurements sub package.
Ensuring unit tests are conisistent with regards to trapping exceptions and throwing assertion error.