Revert "Fixed serialization tests", moved into fixing_588

This reverts commit 3dc96e70d213a14b324fe6cd16b9a1e616004370.