Modified merged with Irinas tests