Fix framework/base tests that were not running. Patch from Bob Morley with a few changes by me - https://issues.apache.org/jira/browse/OFBIZ-3662.