Move tests and clean up a bit more.