Cleanup (test migrated to Junit 4 and generified)
test framework: hamcrest sources added