Fix unit tests
Fix size calculation during recursive scan