More Test cleanup