Updated tests to junit 4 and now using hamcrest matchers