Reverted offline testing changes