Cleanup.
Added tests and results.