Fix ConstructorSelector tests