Unit testing fixed.  PowerMock temporarily an issue.