[WIP] fix tests