Got tests fixed up and did some reorganization.