Fixed tests, created current user helper