Updated blackbox tests to work with new metadata classes.