adjust tests to get types right