tests and re-org