more fixes for gd tests