YHM-855 fixing tests and formatting of some files