Changed freaky failing hamcrest matchers (depending on java6/7) to self written methods