improve ability to mock loading with includes