more tests
Merge branch 'parsing'

Conflicts:
	watcher/tests.py
solved merge conflict