Slight tests cleanup.