Merge "Fix Tv Pip tests"