Added upgrade step and fixed tests.
Release 0.6.0.9