refactored literals to constants
refactored 'should' in tests