extend tests
update upgrade step