More test cleanup and re-org.