Adapting assertions in unit tests merged from trunk to reflect changes in the API due to RFE requested by Erik Carlin