Fixed broken 'COUNT(*)' tests.