Rearrange fixtures
Update broken tests