Fix issue with redirections
Add support for bad-list settings and include Test