Rename tests.
New test models.

Remove extraneous whitespace