Fixed failing test under version 2