Fix for testing commands