More test warning fixes -_____-