More unittests

I created these tests a while back when some of these tests used to fail. Head revs of master all pass though now :-)