Use fixed mappings for known capabilities and options, added tests