Remove @todo in phpunit tests

Change-Id: Id1f3b2a0372b46a7bf7f0d70b142af227e5a393e
Merge "Remove @todo in phpunit tests"