Beautify, more tests, and custom role commands