Authentication entities added, refactored
Test fixed