Fix tests according to new functionality.