Add Countable interface with test