Working on civs.model-test