Clean code.

Re-enabling ignored test.