Modify to enable unit tests