Convert rest of the tests to use fixtures

This references #141, see the discussion there. 
@witsch: can you take a look?