More tests cleanup.