Testing commands updated
Handling for all types of configurations