Added upstream tests