Add class and test program