Fix tamarin test files for expected fails