Add class attribute and two test