wip: cleanup and move test