Test rewritten as Unittest