Added support for unittesting