[Monica, Andrei] fixed tests