Non-leaky tests via better fixtures