Lot of changes done to all tests.. hive test committed