First round of metadata tests and some bug fixes

I was using the wrong soup name for the master soup.