Start of removing PowerMock from TestRequirement