Updated model test var names.
Updated model tests.