All unittests are working; trying to improve performance (wip)