HV-871 Making TypeHelperTest compilable with Java 7 and 8