Fixed namespace issues that were preventing tests passing in packaging
org.  This metadata was retrieved from the packaging org