WIP: fixing 9 more errors in unittests