Got it building with the new GetCurrentUser() helper
Most unit tests passing