Incorrect references in tests are fixed