replace absolute dir names in test output, fix two tests