CLOUDIFY-2073 Improve mocks to store multiple state. Enhance multi-instance test assertions