added support for unittests