updated data fixtures
refactored generate token method th utils class