Revised tests to have World Cup theme, used block quote
Refactor tests, delete rspec tests
resolve merge conflict