test files from Alvar
conflict resolved