removed macro-based verification with a helper class