Fixes some failure and accelerating the Unit-tests