With the changes to how to test-requirements are installed, some new failures are showing. This patch corrects them. Change-Id: I641b167f1b7f5bb283d73481ed6185e1ccbd8ed3