Fix tests for TVA