* sanitize test code base and factorize common code * fix failing tests * fix failing tests * fix failing tests