ex_7 fix & more junit tests