Fix and reorganise depednencies
Do not use CoreMatchers (provided by junit) but Matchers (provided by hamcrest)