Added the `withdraw` collision resolution; removed dead comments; de-linted the testsuite