Changed tests according to the new mapping