Add more argument helpers and test them
Restore capability checks and add tests for them