Add Classes and do test