Update some references in the tests. Not done yet