update test feixture to match model
more test fixture updates
Merge branch 'jpeak5' into dev