Merge "Revert "Add unit tests for LoaderTask"" into main