Modify some test setups to work correctly in Origin context