Updated _getOrigin, modified test timeouts