Fix various test related to new OM2 database