added tests, dao  and trellomerge.py