Changed tests and mapping information