Updated tests for new model implementation.