Remove the 'special-case' Stubby and just use the collection of them
Test updated now we just keep a collection of Stubby instances