Did some refactoring of the test model...just renamed some stuff to be a little cleaner.