GenTests Fix

Fixed broken gentests.