Changed tests according to new mapping