Add upade methods and tests and reworked sequence of tests