Modified some tests to use reworked fixtures.