Modify all classes, add test classes