Add tests and the AllActiveIncentive factor