Eclipse 4.3 support: org.junit4 removed

org.junit4 no longer available, use org.junit and adjust some tests
because 'containsString' now in hamcrest.CoreMatchers