Some changes made for test