Beefed up eq test