Continuing refactoring

* Merge from dev
* Misc. fixes to ProfileClient
* Added unit tests for ProfileClient
* Added mocks
ProfileClient doesn't implement any interface so we can't really mock it. We are mocking `IDataStore`