Intermediate commit.

Rewriting testing.