Update tempting tests
Merge