Added unit tests for maps to avoid this problem again.