Fixed tests.

Codereview fix for 87e698d