Bug fixing: adding files for testing and command class
Removing traces