added unittests workaround