Clean up Descriptors and Add Tests