WIP: updating tests