Added tests
Fixed progress template