Tighten up test-case