#84: Test fixed and bug fixs.