Complete flowControl and pass tests