Beefed up test-for