Fix shuffle issues
Add test data