Modify test to avoid strict count(*)
Merge remote-tracking branch 'origin/master'