Beefed up eq test
Merge branch 'master' into solution