Modified graphs to use tracked feature types. Feature graphs are temporarily disabled. Modified tests associated with the change.