Some changes in testsuit