Andrea: fixing unit tests