Update tests bootstrap, refactoring for code updates