fixed tests by updating model structure