Moved Request to bottom of file
Some color
Improved test coverage