More changes, new unittests are still crashing