Improved simple command, more test scripts.