REVIEW-3307: Moved metadata descriptors to subdirectory. Added some tests.