Updated code and testdata download