Blacklists tests and tweaks