Fix for blacklist when update
Add unit test for blacklist criteria