Update unit tests to handle different current user service structure

Update unit tests to handle different current user service structure #296