Fixed bug from #152.

Problem with overriden Enum serialization to Map.
We added also tests confirming the problem.

Kamil Krol & Dreando