More tests and clean up.