Added one-to-one bidirectional mapping with test.