Adjust the unit-tests as we now return more data than previously