New model + adjusted tests