Added paper and changed tests