Add an additional test for CountField, remove needless code