Adding more testing to Metadata along with necessary utility change