Improved the descriptors for testing.