Fix Junit tests failed