Add classifiers
Change deprecated assertions