Added some extra metadata and functional tests too!
Finished the extra diagnostics