Add workaround for unit tests