Fixed modelClass tests