FIX issue 111: Add more unittests (missed in merge from jenisys).