Merge "Added unit tests for blacklist and whitelist"