add missing class
fix test
fix problems