Enhance SuperTest helper and shorten tests.