improve test command, misc tweaks