adjustments for gem and testing