Simplify preload by running it before generating columns
Improve coverage for new preload mechanisms