Conservation now using ResidueCount; tests added