Add Tracking autogenerated entities and tests