Added workaround for tests