CR comments Whitespace wip test refactoring more test refactoring Re-write download URL too. Test fixes related to download change, and fix wip, re-locating tests update classname Quality fixes