Change expects for backward/forward compatibility