Update rubber plan
Add Block tests
Add flow control tests