A few more unit tests pass. No more stack overflows when running unit tests.