Update stale fixtures
few more fixture updates
Update Tests to new fixtures