Correcting serialization options
Correcting solution file and including tests