FIX for failing functional tests.

Tests were including all fixtures, including a deprecated test framework
fixture that no longer had a model. It was trying to delete it at the end of
each test but couldn't because it didn't exist. Changed to include only the
necessary fixtures.
Merge pull request #1010 from umsmit32/test-framework

FIX for failing functional tests.