Tests work now, but only one type