Add StatementDeserializerTest and fix some issues
Create StatementSerializerTest