merged format into test.py, strings side by side...
fixed test.py bugs, moved methods