change serialization order; change testing file names