Refactored tests.
Removed serialize/deserialize from naming.
Implemented reverse mapping.