Fixes, command tests.