Added math.test and empty classes