fix progress count
fix tests