Add ability to unit test