Add class & some function tests