Merge "New scenario test case for TLD + re-factoring"