bug: Fix junit tests for Java 8

Change-Id: I1f1eb654c14bd1bf665af568d4411fd21fa29762
bug: Fix junit tests for Java 8

Change-Id: I44bab149572222df99f20d075cb8eb3c7bcdc731