merged in matts fix for testsuite; resolved conflicts with common:file-exists? additions