Fixed reference to deprecated from_resource/to_resource, this caused an error when the new from_obj/to_obj is used
Corrected terminology, removed un-needed variables
Added test cases for abstract mapping