Clean up, darwin stuff absorbed into test