Map more information and add unit tests