Changes descriptor corrections and tests.