Expand tests, cleanup.