Multiple changes to support loading in surefire tests