A few more tests.  Still not working as expect but not breaking