Some changes made to test