Updated model and tests