HG-60 fix tests and rename some files