Also updated tests accordingly. Patch originally proposed by Aude. Change-Id: Id83f6fb80d394e6fac4d7486ba2feae9e9c5bd99