bidirectional map added, tests adapted