EG: WIP; fixing test