Fix for origin tests