Updated tests. Cleanup.