Refactor RawInterfaceMap
Update tests