Added more cases comparing to Java