refactoring updateTests and adapting some tests because of rewriting method names