Fixing test structure and broken consumer extension test