9 failing tests in DaVinci

Due to not yet merging !618 (merged) (as it needs a bit more work) 9 tests are currently failing.