InfiniteLoader: fixing majority of test errors