a bunch more empty tests ready for filling, and a fix.