refactored fonts passenger and added tests