Reorganized sample data loading for tests and development