Improved default user value for testing
Fixed non-handled currentUser states