Fixed up tests and added more functionality to some profile services