added additional options to ClientBuilder

added some tests - red
refactor to redirection handler