Change strategy back to mkdir, add a lot of tests.