am 7d69e6ce: am d4454a02: am 34892942: am e2055a5d: am 586adb3a: TV: fix tests to match updated framework behavior

* commit '7d69e6ceaefd9bd7b30eaa3af71194618b135cf7':