Reorganization of code and work towards moving away from hard coded test data.