Project cleanup.
New tests.