Fix for mock instances overriding eachother

Fix for mock instances overriding eachother