Fixing DEPRECATION WARNING for layout_by_resource and improving capy_bookmark_test.