Updated Tests
Added TODO
Fixed Spelling Errors
Setting up mapping tests