Added further testing for mapping features