Cristina's unit test update