added whitelist review and unit-tests