fixes to TestOrigin