Fix the rest of the tests.
Fix the rest of the tests.

Qwiklabs/codelab-tools,googlecodelabs/tools,Qwiklabs/codelab-tools,googlecodelabs/tools,Qwiklabs/codelab-tools,Qwiklabs/codelab-tools,googlecodelabs/tools,googlecodelabs/tools