Simplify.
Simplify unit tests.