DATACOUCH-37 - Refactor Deprecated JUnit Asserts.

Removed deprecated methods and changed to Hamcrest.

-=david=-