Add apache commons io and hamcrest matcher