Consolidate test fixtures and models

This should resolve #112.