Add tests for count