Fixing tests.

--HG--
branch : two_point_oh