Merge "Use core-tests-support instead of core-tests" into klp-dev