Added Count & tests