try to fix following issue in tests