Remove overly fragile tests, name fixtures so their purpose is clearer.