Dont add metadata by default
Closes #1691
Fix test to check for no metadata