Some test fixes and fallback to archived version on 404

fixes #10