All test rewritten :-D