Refactored tests, added dependency on Hamcrest