Extraced switch definition to includes directory and also validated test examples successfully.