Simplified two tests by reducing the number of fixtures.