remove unfactored map and re-name factored map
aligned test probe with factored map classes, debugged the factored
classes.