fix tests, and add dr from Marion