Use let blocks for fixtures

Currently using let!, but we should see if we can get away from this