Optional raw mode

Make the tests work with the new commands api.
Rebase master