Serialize2

Fix one missing string and add test