roo commands, tests refactoring