fix order in common commands, add tests