Fixed test case setup.
Got rid of XML based samples.