Loader updates and tests