update test_foo
Merge remote-tracking branch 'origin/master'

Conflicts:
	mock/test_foo.py