Changed store source and tests to the new Sample structure