Load data properly
Refine data loading tests