Extended model to handle test instance