Merge "TV: fix tests to match updated framework behavior DO NOT MERGE" into lmp-sprout-dev