Increased test coverage based on Sonar.
Updated the newly added tests to use the Hamcrest framework.
And flipping the order of the args from expected then actual to actual then expected.
Merge pull request #994 from rackerlabs/REP-738

Increased test coverage based on Sonar.