Write test for metadata macro, follow up on metadata review