WIP: convert to expect