Added dialogue lists, fixed test.py
Merge