tests fixes
Merge branch 'test_fixes' into 113445_update_docs_python_client

Conflicts:
	test/test_pm.py