Add first class and test