Work toward fixing the serializable test failures