Use commands instead of generators
Don't prompt in tests