Test cleanup, merging multiple tests