Re-organize contains_key tests. Add empty map test.