adjusted test_util.py
better match
added Directory
renamed
added shortcuts