WIP: better test