fixes for gd tests