Test cleanup WIP