Re-add account subtype class method tests