Cleanup
Add test for referenced descriptions