Migrated tests to Hamcrest (fixes #12)