Fix progress + test