Offline testing capable fixes