Tighten up test setup.