Test cleanup merged in