Added test models and additional updates for tests.