Serializability testing & fixes