I've changed it to set block to instance scope. Also I've changed tests according these changes, I'm not sure if they are correct so please pay attention in them