Bug fixes to get base Origin tests passing