Better unit tests and nits.