Fixing up the test framework
Main, command tests