added support for unit tests