Fixed test builders to build Super Villains properly