count set tests. small fixes