Various fixes found from testing. New and modified tests for the ContentSpecProcessor class.