Remove pointless test plan
string operation_id
Fix tests
Add two more plans