Update change log
Refactor upgrade steps and their tests