Some fixes

about unit tests and ProgressController