Most unittests are now working; a few are still failing
All unittests are now working