included changes proposed by @ngaranko

Conflicts:
	OIPA/api/tests/test_api_tools.py