Merge "TV: fix tests to match updated framework behavior" into lmp-mr1-dev