Fix delegatetest.
Cleanup.
Fix arraytest. (again?)