Test cleanup/3.2.3