Minor changes to clean up ProfileClient code, avoid inconsistency with test folders
Merge remote-tracking branch 'alvaro/master'