Added Samples, SampleHolder and logic to TestCell
Modified changes to Sample