Make all Junit tests work again