Fixed failing test issue