Add metadata display
Add in lost unit test from takedown mess.