update tests with changes from daniel