added an extra param to detect when a block is included
updated fetchSlotManager not to thrown an exception by default
updated tests to work with latest chages