fix things that have gone old

[martindurant]

Had to put in some xfails in here due to remote files that disappeared, should find some replacements sometime.

[raybellwaves]

Thanks @martindurant !