changed class name
fix test bugs