Fix changelog and docstring
Refactor upgrade step and add test