Adding tests for mapping