Further refactoring of the functional tests.
More functional test cleanup.
Add test for the Item model