wip cleanup tests