Integrate changes on tests