Updated tests and merged (after many perceived issues merging) into the code base.  Also fixed some PowerMock tests that were not needed.