More beautiful and correct if statements
Add test test_map_non_existant