New submit
Rewriting testcases