prepare for kiama 1.4
less ambiguous names in tests to avoid colisions with pathnames