correct back to obj refs
improve mapper_test