Refactor Matchers to use Hamcrest naming conventions (#31)
Remove unused import