Fixed tests; whacked 'skolem' check from kind generalize