Fixed minor things.

Commented some tests.