adding support for unit tests