JLANG-12 Merge lang-integration and lang-test