fix phpunit tests

Change-Id: I313e69b8f2e9d2d6e71559d1a28a6f5ea1022e11
Merge "fix phpunit tests"