Updated loader and geo tests