Add class and test