* Aurora and Fantom handled wrong in a couple cases Change-Id: I09b7d2da46507e219bd99d945256e63fefad529c * Original test covered upper / lower case Change-Id: I0384b0aac6f63bf9782d393fcd4e4e67f353775a