Fixed Tests
Refactored Payment Block. Removed ternary statement and checked
length of line
Code Style