Migrating to ability to have unit tests