Repaired test_loader
Revert "Repaired test_loader"

This reverts commit 537f72390300aafa3e5da14c17f1969c2c08ba17.