Fixed failing acceptance tests with count query