Re-organized for slightly better testing setup.