Improved Varasto tests