Merge "bug fix: when running manually a test, get stuck in echo"