Moving datadriven demo tests to datadriven dir