clean up P2GAM handler
add sub-mapping test