Cleanup in mock classes, mock logic moved from block stream to client.py, mock vops mimic original call