Update tests files for last refactoring