Fixed test, modified my universal loader, fixed some calls not workingå