JLANG-26 Fixed tests