Fixed classes with the serial, and tested it