Convert to multitask

Nothing crazy, just duplicated the test directory and made the assertions pass :)