ADDED: ShipyardApiMetadataTest back into initial round of code-review per @nacx suggestion