bug: Update junit tests not compatible with Java 8

Change-Id: I1f1eb654c14bd1bf665af568d4411fd21fa29762