merge upstream dasein test changes