Minor changes to clean up ProfileClient code, avoid inconsistency with test folders

...est folders