Better test commands for initial testing