Fixing builders tests