Fixed unit tests to account for the changes in commit ac5e9239e428c7319c60ad2edd803fab0ee939b7.