Modified children set to include a mapping to State

Also: Full engine test, fixed partial functions