fixing tests and a few gedi bugs