modified and extended test


git-svn-id: https://ilk.uvt.nl/svn/sources/ucto/trunk@16296 12f355fe-0486-481a-ad91-c297ab22b4e3
re-re-refixed folia stuff


git-svn-id: https://ilk.uvt.nl/svn/sources/ucto/trunk@16297 12f355fe-0486-481a-ad91-c297ab22b4e3