more coverage on nto, osc types and osc bundle+builders