Modifications related to test data
Organised test data and modified all examples to use it