#44 fixing tests after moving factors.primitives to indices.primitives