added model tests
cleaned up clutter