Cleaned up test dependencies.

Removed dependency on internal JUnit hamcrest matcher.