Comment and simplify tests.