#60 Changes to allow testing and coverage