adjust tests to get types right (2)