Fixed tests (HIVE-2416)