Moved descriptor_dereferencer to descriptor/dereferencer and moved and re-enabled some specs