Fix testing issues
Improve tests, to work around windows & wget limits