Cleanup test to make playback easier/reliable.

Change-Id: I9461b86a98eb651d114c3dfb35bd073cbcfd58b1
Merge topic 'lookup_table_cleanup' into next

396a9a1f Cleanup test to make playback easier/reliable.