Updated test spawner yet again, using LINQ