Fixed mapping test