Added class tests