Fixed: tests related to second phase completion and splitting checkpoint
manager into components