Fixed tests according to new exception messages