Fixed result counts
Fixed tests