Drop unnecessary checks.
Clean-up test some more.