update todo
remove 'method' key and matching; add server matching from 'require' key
fix tests
standardize 'format' regex
update todo