Move the tests from Dagobah

self-merge