Forgot to commit some test fixes. And added done multiple times test