Finish off mapping test cases