Reduce complexity, added tests PROV-O