fix test and fix class file