wip - rewrite test