bitmark: uri support and test update