Clean and fix small issues
Improve unit test for export anchors