Improve and fix test for crawlable
Fixed and improved crawable and its tests.