Added count() tests. Rearranged method order.