Restaure test suite (part I)